diff --git a/bookstore/src/main/resources/messages.properties b/bookstore/src/main/resources/messages.properties
index 85ee7bd..48ae32c 100644
--- a/bookstore/src/main/resources/messages.properties
+++ b/bookstore/src/main/resources/messages.properties
@@ -51,6 +51,7 @@ book.error.isbn                    = Invalid ISBN code
 book.error.year                    = Invalid year
 book.error.price                   = Invalid price
 book.error.isbn.exists             = ISBN code already exists
+book.error.unknownbook             = Unknown book
 book.error.id.invalid              = Wrong book
 
 book.null.author                   = Unknown
@@ -75,13 +76,15 @@ page.title.webform.edit            = Update existing book
 page.title.webform.error           = Error
 page.title.webform.apiref          = API Reference help page
 
-page.text.list.yes                 = Yes
-page.text.list.no                  = No
+page.text.book.publish.yes         = Yes
+page.text.book.publish.no          = No
+page.text.book.delete              = Delete
+page.text.book.edit                = Edit
+page.text.book.json                = Get
+
 page.text.list.published           = Visible\?
 page.text.list.actions             = Actions
-page.text.list.delete              = Delete
-page.text.list.edit                = Edit
-page.text.list.json                = Get
+
 page.text.list.authenticated       = Logged in as
 page.text.list.anon.info           = Nothing but empty abyss here. Sign in to see some content.
 
diff --git a/bookstore/src/main/resources/website.properties b/bookstore/src/main/resources/website.properties
index 81c23ab..d7150ee 100644
--- a/bookstore/src/main/resources/website.properties
+++ b/bookstore/src/main/resources/website.properties
@@ -11,35 +11,43 @@
 # BookController
 # Public end points
 #
-page.url.index            = /
-page.url.login            = /login
-page.url.logout           = /logout
+page.url.index              = /
+page.url.login              = /login
+page.url.logout             = /logout
 
-page.url.list             = /booklist
-page.url.add              = /bookadd
-page.url.edit             = /bookedit
-page.url.delete           = /bookdelete
+page.url.list               = /booklist
+page.url.add                = /bookadd
+page.url.edit               = /bookedit
+page.url.delete             = /bookdelete
 
-page.url.apiref           = /apiref
-page.url.autherror        = /autherror
+page.url.apiref             = /apiref
+page.url.autherror          = /autherror
 
-page.url.error            = /error
+page.url.error              = /error
 
 # BookRestController
 # Public JSON end points
 #
-page.url.json             = /json
-page.url.json.list        = ${page.url.list}
-page.url.json.book        = /book
+# NOTE: do NOT add /json prefix for sub-urls.
+# BookRestController does not like it.
+#
+page.url.json               = /json
+page.url.json.list          = /booklist
+page.url.json.book          = /book
 
 
 # BookBasePathAwareController
 # Native REST API end points
 #
-page.url.restapi.list     = /${page.url.list}
+page.url.restapi.books      = /booklist
+page.url.restapi.authors    = /authors
+page.url.restapi.categories = /categories
+page.url.restapi.users      = /users
+page.url.restapi.roles      = /roles
+page.url.restapi.userroles  = /userroles
 
 # Bookstore assets & resources
 #
-page.url.resources.css    = /css
-page.url.resources.js     = /js
-page.url.resources.images = /images
\ No newline at end of file
+page.url.resources.css      = /css
+page.url.resources.js       = /js
+page.url.resources.images   = /images
\ No newline at end of file