Beefing up places so can support multiple parameters for searching