Improve the code to check if a field has data or not... better support for image fields...