fix #419 : merged labels prevented match popup creation
format + organize imports