rebuilt schema a little to allow for more filters