Fixed tailer and added filtering