Keywords - empty query fix