fixed carat rotation and placement
fixed search results controller crash
Merge remote-tracking branch 'origin/2.2' into 2.2