Making findBy() criteria not arbitrary and moving it to array