Quote query to fix searches with = ? &
Remove deprecated return false