Fixes for advanced search
remove unneeded transalation map
Cleanup
- cleanup unused tables
- Remove unused code