Update grunt, flags, restore search functionality etc