Set weight to Bookmarks#comment
Support null (temporary)
Wrap the result in "<p></p>"
Replace string from query to page_query
Support '-'