Search improvements
Version 0.5.1 pl1