Fix tags to handle multiple screens better