Fix in UserFilter.java to accomodate zones