updated so that uses form data

uses form results to filter what data is displayed