Added simple search fields