Incorporated search changes from 2013.04