Collection search - Am I flexible enough now?