FAIMS-421 - modify selection manager and tools