Added software_id field to swid_tags table
Removed obsolete method
Applied model changes to view