Added lists filtering + minor improvements