Report picker - initial changes