In 8.1.18, more of the filtering for the alarm status & journal table will be moved to the gateway:
Final release is approximately mid June.