remove some duplication & make sure entered titles are actually used