added more locations and WUBLAST helper filters