Don't retrieve options if not required
Make searching case-insensitive