Back to previous functionality with filtering etc.
Finally working with production api
Add config to production