Added non-js pick list for locations