Added better import options and criteria for lookups (old updates)

This commit is for updates made a while ago before starting a pull
request