The Search is still a bit off.
Merging back to master