fixed notices, added filter