Array-related bugfixes and better filtering.