Updated find function to allow for two parameter search