lowered commit time to 5 secs
added the self filter query
cleaned code