Merge pull request #34 from Edzelopez/GEP-19

GEP-19 Notice fixes
GEP-25 Worked on save as draft functionality with saved search values