[Issue #209][WIP] Salma changed column name in services

@m0hamed Please approve.