code cleaning + filter overlay display fixes