Add json views and search in tips_controller
Merge with master