Fixed #SNAPPEAWEB-13
Fixed #SNAPPEAWEB-2
Fixed #SNAPPEAWEB-3
Fixed #SNAPPEAWEB-7
Fixed #SNAPPEAWEB-5