Fix rotation for Search street/city screen
Refactor amenity structure