improve smart source selection especially for picture (fixes #10) || needs more testing