various bug fixes related to NULL queries and landing page