Added more filters for battle reward rules

+ assorted bug fixes