WIP on $container = null errors
Fixed infinite scrolling error when doing searches in quick succession