enclosure.bay is integer rather than string now. Fix the filter to use format, which is more robust in numeric versus string anyway. Also, consistently make the underlying data integer rather than sometimes string.