Adding shift metadata logic and tweaking run search