Added image_state in support decorator
Included tables in SupportSearch