Restructured search, normalized Backbone modules and fixed another race condition