Cleanup and fixed unmapped criteria from affecting the overall search total