Push to beta server
Refactored and search and filter now works