clean up messy conditional for analytics cred to make it generalizable

meant to do this earlier but forgot
fix continue bug

I got continue and break mixed up.  good reason not to use either
make alias queues a dict instead of a list