Few bug fixes, query handling, & :lipstick: