avoid using real name if custom names are present for sub search
Merge pull request #225 from sarakha63/development

avoid using real name if custom names are present for sub search