Fixed: Retaining Query

Fixed an issue related to retaining search queries