[AESH-270]
completion should work a bit better