removed some null
changed filter interface
corrected Gotham and Rays filters