updated queries

funnel_report.py completed for now
added treatment to PSadmin
setting sample notes to be Null if empty