Added client side checks to prevent duplicate queries
Merge branch 'dev/temp' of github.com:scrollback/scrollback into dev/temp