Check for null results, re-add boring search