[#TEXTIMG-3: Change set null db values to correct returned ones]
[#TEXTIMG-3: Change query to delete old files]
Merge branch 'TEXIMG-3'