fixed conflicts
Merge branch 'elastic' of https://github.com/feelos0ff/targetmaker.git into elastic
need filter